From 811ca618e388b05ea7117aea424c1d3af4a4ef58 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 30 Mar 2006 17:50:40 +0100 Subject: [PATCH] Change how we add the include asm override to CPPFLAGS. Add to CPPFLAGS instead of entirely redefining it. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/i386/Makefile | 2 +- linux-2.6-xen-sparse/arch/x86_64/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/Makefile b/linux-2.6-xen-sparse/arch/i386/Makefile index 527707677e..d715e410e6 100644 --- a/linux-2.6-xen-sparse/arch/i386/Makefile +++ b/linux-2.6-xen-sparse/arch/i386/Makefile @@ -107,7 +107,7 @@ boot := arch/i386/boot zdisk bzdisk fdimage fdimage144 fdimage288 install ifdef CONFIG_XEN -CPPFLAGS := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE) +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o boot := arch/i386/boot-xen .PHONY: vmlinuz diff --git a/linux-2.6-xen-sparse/arch/x86_64/Makefile b/linux-2.6-xen-sparse/arch/x86_64/Makefile index 6ac38f51a8..5d67f13b03 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/Makefile +++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile @@ -71,7 +71,7 @@ boot := arch/x86_64/boot fdimage fdimage144 fdimage288 archclean ifdef CONFIG_XEN -CPPFLAGS := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE) +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS) head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o LDFLAGS_vmlinux := -e _start boot := arch/i386/boot-xen -- 2.30.2